From b2d639b6d90982208589b9f0a7b8ba768275fff6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Sat, 27 Jul 2019 07:57:06 +0200
Subject: [PATCH] window: Unroot with old display

Things might rely on the old display being set while unrooting.

Fixes #2052
---
 gtk/gtkwindow.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 5061f7e648..1ee033f193 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8087,9 +8087,10 @@ gtk_window_set_display (GtkWindow  *window,
                     "notify::gtk-application-prefer-dark-theme",
                     G_CALLBACK (gtk_window_on_theme_variant_changed), window);
 #endif
-  priv->display = display;
 
   gtk_widget_unroot (widget);
+  priv->display = display;
+
   gtk_widget_root (widget);
 
   g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_DISPLAY]);
-- 
2.30.2